From adeed21529928c872b8379714a976c2380d176eb Mon Sep 17 00:00:00 2001 From: "jbulpin@wicket.uk.xensource.com" Date: Sat, 29 Oct 2005 01:58:00 +0100 Subject: [PATCH] Prevent event listener socket from being inherited by children. This was passing down to dhclient which was keeping the 8001 port open and preventing xend restarting. Also fixed a case typo in setCloExec Signed-off-by: James Bulpin --- tools/python/xen/web/tcp.py | 2 +- tools/python/xen/xend/server/event.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/python/xen/web/tcp.py b/tools/python/xen/web/tcp.py index b9dddd1526..743fd6daf3 100644 --- a/tools/python/xen/web/tcp.py +++ b/tools/python/xen/web/tcp.py @@ -99,7 +99,7 @@ def listenTCP(port, factory, interface='', backlog=None): return l def SetCloExec(SocketListener): - SocketListener.SetCloExec() + SocketListener.setCloExec() def connectTCP(host, port, factory, timeout=None, bindAddress=None): c = TCPConnector(host, port, factory, timeout=timeout, bindAddress=bindAddress) diff --git a/tools/python/xen/xend/server/event.py b/tools/python/xen/xend/server/event.py index bf0521c764..ab03c2cb6a 100644 --- a/tools/python/xen/xend/server/event.py +++ b/tools/python/xen/xend/server/event.py @@ -192,4 +192,5 @@ def listenEvent(daemon): if xroot.get_xend_http_server(): port = xroot.get_xend_event_port() interface = xroot.get_xend_address() - tcp.listenTCP(port, factory, interface=interface) + l = tcp.listenTCP(port, factory, interface=interface) + l.setCloExec() -- 2.30.2